widgets: Remove (GtkTickCallback) casts

Instead, make the functions conform to the prototype, so that casting
isn't needed.

diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
index 0c55636f4c82a4483ccd694288db4980a393188f..6979f6a4bcf373ca946202eb710188a013af89cd 100644 (file)
--- a/gtk/gtkflowbox.c
+++ b/gtk/gtkflowbox.c
@@ -2733,7 +2733,7 @@ add_autoscroll (GtkFlowBox *box)
     return;
 
   priv->autoscroll_id = gtk_widget_add_tick_callback (GTK_WIDGET (box),
-                                                      (GtkTickCallback)autoscroll_cb,
+                                                      autoscroll_cb,
                                                       box,
                                                       NULL);
 }

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 6978674464b24e6f8e77253253c3362bd0e288f9..99dcaec2d7fcd78d6c1b394da57ecf0e2c1df4a1 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -2877,7 +2877,7 @@ add_autoscroll (GtkRange *range)
     return;
 
   priv->autoscroll_id = gtk_widget_add_tick_callback (GTK_WIDGET (range),
-                                                      (GtkTickCallback)autoscroll_cb,
+                                                      autoscroll_cb,
                                                       range,
                                                       NULL);
 }

diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c
index f37c24bf13fbd71d1b182a059aa2a4725ec6ef95..168e1710565e9562a70dd1759657d29419e8ab8a 100644 (file)
--- a/gtk/gtkrevealer.c
+++ b/gtk/gtkrevealer.c
@@ -547,10 +547,11 @@ gtk_revealer_animate_step (GtkRevealer *revealer,
 }
 
 static gboolean
-gtk_revealer_animate_cb (GtkRevealer   *revealer,
+gtk_revealer_animate_cb (GtkWidget     *widget,
                          GdkFrameClock *frame_clock,
                          gpointer       user_data)
 {
+  GtkRevealer *revealer = GTK_REVEALER (widget);
   GtkRevealerPrivate *priv = gtk_revealer_get_instance_private (revealer);
   gint64 now;
 
@@ -589,7 +590,7 @@ gtk_revealer_start_animation (GtkRevealer *revealer,
       priv->end_time = priv->start_time + (priv->transition_duration * 1000);
       if (priv->tick_id == 0)
         priv->tick_id =
-          gtk_widget_add_tick_callback (widget, (GtkTickCallback)gtk_revealer_animate_cb, revealer, NULL);
+          gtk_widget_add_tick_callback (widget, gtk_revealer_animate_cb, revealer, NULL);
       gtk_revealer_animate_step (revealer, priv->start_time);
     }
   else

diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c
index 3b338be7a2eb4b9bb47b9dd6a08e00c29295731e..042f8fd95b23d7743979b28716084f8a8bab8463 100644 (file)
--- a/gtk/gtkstack.c
+++ b/gtk/gtkstack.c
@@ -767,10 +767,11 @@ gtk_stack_set_transition_position (GtkStack *stack,
 }
 
 static gboolean
-gtk_stack_transition_cb (GtkStack      *stack,
+gtk_stack_transition_cb (GtkWidget     *widget,
                          GdkFrameClock *frame_clock,
                          gpointer       user_data)
 {
+  GtkStack *stack = GTK_STACK (widget);
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
   gint64 now;
   gdouble t;
@@ -805,7 +806,7 @@ gtk_stack_schedule_ticks (GtkStack *stack)
   if (priv->tick_id == 0)
     {
       priv->tick_id =
-        gtk_widget_add_tick_callback (GTK_WIDGET (stack), (GtkTickCallback)gtk_stack_transition_cb, stack, NULL);
+        gtk_widget_add_tick_callback (GTK_WIDGET (stack), gtk_stack_transition_cb, stack, NULL);
       g_object_notify_by_pspec (G_OBJECT (stack), stack_props[PROP_TRANSITION_RUNNING]);
     }
 }